Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 15 Apr 2006 18:25:21 +0000 (19:25 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 15 Apr 2006 18:25:21 +0000 (19:25 +0100)

Trivial merge